Merge "Fix warning "ob_end_flush(): failed to delete and flush buffer" during uploads"

diff --combined includes/filerepo/FileRepo.php
index 28021ef,0c37d78..b15f81f
--- 1/includes/filerepo/FileRepo.php
--- 2/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@@ -78,6 -78,10 +78,6 @@@ class FileRepo 
         */
        protected $scriptDirUrl;
  
 -      /** @var string Script extension of the MediaWiki installation, equivalent
 -       *    to the old $wgScriptExtension, e.g. .php5 defaults to .php */
 -      protected $scriptExtension;
 -
        /** @var string Equivalent to $wgArticlePath, e.g. https://en.wikipedia.org/wiki/$1 */
        protected $articleUrl;
  
@@@ -162,7 -166,7 +162,7 @@@
                $optionalSettings = [
                        'descBaseUrl', 'scriptDirUrl', 'articleUrl', 'fetchDescription',
                        'thumbScriptUrl', 'pathDisclosureProtection', 'descriptionCacheExpiry',
 -                      'scriptExtension', 'favicon', 'thumbProxyUrl', 'thumbProxySecret'
 +                      'favicon', 'thumbProxyUrl', 'thumbProxySecret',
                ];
                foreach ( $optionalSettings as $var ) {
                        if ( isset( $info[$var] ) ) {
@@@ -578,8 -582,8 +578,8 @@@
         * Get an array of arrays or iterators of file objects for files that
         * have the given SHA-1 content hashes.
         *
 -       * @param array $hashes An array of hashes
 -       * @return array An Array of arrays or iterators of file objects and the hash as key
 +       * @param string[] $hashes An array of hashes
 +       * @return array[] An Array of arrays or iterators of file objects and the hash as key
         */
        public function findBySha1s( array $hashes ) {
                $result = [];
@@@ -599,7 -603,7 +599,7 @@@
         * STUB
         * @param string $prefix The prefix to search for
         * @param int $limit The maximum amount of files to return
 -       * @return array
 +       * @return LocalFile[]
         */
        public function findFilesByPrefix( $prefix, $limit ) {
                return [];
@@@ -740,7 -744,9 +740,7 @@@
         */
        public function makeUrl( $query = '', $entry = 'index' ) {
                if ( isset( $this->scriptDirUrl ) ) {
 -                      $ext = isset( $this->scriptExtension ) ? $this->scriptExtension : '.php';
 -
 -                      return wfAppendQuery( "{$this->scriptDirUrl}/{$entry}{$ext}", $query );
 +                      return wfAppendQuery( "{$this->scriptDirUrl}/{$entry}.php", $query );
                }
  
                return false;
@@@ -789,7 -795,7 +789,7 @@@
         * should use File::getDescriptionText().
         *
         * @param string $name Name of image to fetch
 -       * @param string $lang Language to fetch it in, if any.
 +       * @param string|null $lang Language to fetch it in, if any.
         * @return string|false
         */
        public function getDescriptionRenderUrl( $name, $lang = null ) {
@@@ -928,7 -934,7 +928,7 @@@
         * Each file can be a (zone, rel) pair, virtual url, storage path.
         * It will try to delete each file, but ignores any errors that may occur.
         *
 -       * @param array $files List of files to delete
 +       * @param string[] $files List of files to delete
         * @param int $flags Bitwise combination of the following flags:
         *   self::SKIP_LOCKING      Skip any file locking when doing the deletions
         * @return Status
@@@ -1378,7 -1384,7 +1378,7 @@@
        /**
         * Checks existence of an array of files.
         *
 -       * @param array $files Virtual URLs (or storage paths) of files to check
 +       * @param string[] $files Virtual URLs (or storage paths) of files to check
         * @return array Map of files and existence flags, or false
         */
        public function fileExistsBatch( array $files ) {
@@@ -1484,7 -1490,7 +1484,7 @@@
         * Delete files in the deleted directory if they are not referenced in the filearchive table
         *
         * STUB
 -       * @param array $storageKeys
 +       * @param string[] $storageKeys
         */
        public function cleanupDeletedBatch( array $storageKeys ) {
                $this->assertWritableRepo();
@@@ -1628,7 -1634,11 +1628,11 @@@
                $status = $this->newGood();
                $status->merge( $this->backend->streamFile( $params ) );
  
-               ob_end_flush();
+               // T186565: Close the buffer, unless it has already been closed
+               // in HTTPFileStreamer::resetOutputBuffers().
+               if ( ob_get_status() ) {
+                       ob_end_flush();
+               }
  
                return $status;
        }
@@@ -1700,7 -1710,7 +1704,7 @@@
        /**
         * Get a callback function to use for cleaning error message parameters
         *
 -       * @return array
 +       * @return string[]
         */
        function getErrorCleanupFunction() {
                switch ( $this->pathDisclosureProtection ) {
@@@ -1889,7 -1899,7 +1893,7 @@@
        /**
         * Get an UploadStash associated with this repo.
         *
 -       * @param User $user
 +       * @param User|null $user
         * @return UploadStash
         */
        public function getUploadStash( User $user = null ) {
@@@ -1922,7 -1932,7 +1926,7 @@@
  
                $optionalSettings = [
                        'url', 'thumbUrl', 'initialCapital', 'descBaseUrl', 'scriptDirUrl', 'articleUrl',
 -                      'fetchDescription', 'descriptionCacheExpiry', 'scriptExtension', 'favicon'
 +                      'fetchDescription', 'descriptionCacheExpiry', 'favicon'
                ];
                foreach ( $optionalSettings as $k ) {
                        if ( isset( $this->$k ) ) {